Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Недельный апстрим #89

Merged
merged 734 commits into from
Dec 8, 2024
Merged

Недельный апстрим #89

merged 734 commits into from
Dec 8, 2024

Conversation

Zekins3366
Copy link
Collaborator

Мяу

Errant-4 and others added 30 commits November 5, 2024 19:03
* fix artifact debug assert

* do the same for EffectBigIron

* 1 tab less
remove wanted list from captain PDA
…te (#33153)

* make admeme mouse eternally hungry and thirsty by increasing decay rate

* no starving slowdown, fix unnecessary declarations

* REVERTUS DELETUS
* Rework flaregun and add security shell gun

* Make flare gun twice as likely to appear in emergency lockers

* Security shell gun can now fire lethal shells like the flare gun used to be able to.

* Rebalance the sec shell gun material cost to primarily be steel instead of plastic

* Define the ShellShotgunLight tag in tags.yml

* Leave the no lethal shells for normal flareguns to a different PR.

* Move a comment to re-run checks.

* Bye bye lethal shells from plastic guns.

* Fix weird whitespace issue.

* Make the sec shell gun inherit the normal flare gun.

* Remove the rack verb and update the sec shell gun description

* Remove the ability to fire lethals from flare guns, pending blowing up the gun

---------

Co-authored-by: SlamBamActionman <[email protected]>
* Initial commit

* Change burst fire variable to be a set value rather than a multiplier
…unds (#32981)

remove chair + changed maints db to rubber
* fix

* oops, used savemap instead of savegrid
* Fix reserach disk crash

* remove extra whitespace

* removed args.handled where args are not handled
* One line fix

* Removed redundant using

* Allocation improvement
* pass Actor to cartridge messages

* NonSerialized gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

* add vebr

* add access to the components

* 2/3

* fix

* relay damage from disguise to user

* fix integrity

* :trollface:

* :trollface:

* m

* kill integrity

* fix a bug

* review

* remove them from component

* relay flash effect to the disguise

* fix icon being weird

* change method since multiple systems cant handle same network event

* :trollface:

* actually network Disguise real

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Sec Shell Gun Craftability Hotfix

* Capital Fix
FrontierATC and others added 26 commits December 6, 2024 16:29
* Cleared contraband from Emotional support RPG

Added BaseClearContraband to remove C3 contraband marker from emotional support RPG

* Update toys.yml

---------

Co-authored-by: Dvir <[email protected]>
* Medipens II Update

* Sprite and visual update.

* Sprite correction. Recipe fix. Remove "clean pen" recipe.

* Dex PLUUUUUS

* Plus once more.

* TranexamicAcid buff

* Update Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

Co-authored-by: Whatstone <[email protected]>

* Apply suggestions from code review

Oh boy

Co-authored-by: Whatstone <[email protected]>

* Pen goodening

* Crafting recipe correction

* Whoops. Duplicates added to the wrong file.

* Whatstone requested changes.

* add Hypospray for transfer amount

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* Update lockers.yml

* Update Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml

---------

Co-authored-by: Whatstone <[email protected]>
* Fix gold wristwatch, no matching station teleport

* MailCommand: works with any entity, not containers

* Add Frontier comments to MailtoCommand
…-14#2465)

* Update event announcements

* Change "we advise" to "affected personnel"

* Tweaked solar flare event text

* Spacing

* Pluralize shuttles

* Migrate files

Migrated changed files from ``Resources\Locale\en-US\station-events\events`` to ``Resources\Locale\en-US\_NF\events`` to be with the other frontier specific events.

* Frontier-specific event descriptions

* Update Resources/Locale/en-US/_NF/events/gas-leak.ftl

* Update Resources/Locale/en-US/station-events/events/ion-storm.ftl

---------

Co-authored-by: Checkraze <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
* Moth digestion

* Mark pyrotton material as MothFood

* MothFood component, flavor "like cotton"

* Update Content.Server/Body/Components/StomachComponent.cs

---------

Co-authored-by: Dvir <[email protected]>
* Added rubber ammo to SecurityTechFab

Moved nonlethal recipes from dynamic to static for SecurityTechFab inherited by NfsdTechFab

* Return and comment shotgun recipes

* Moved to NFSD

* Update lathe.yml

* NFSD Stuff

* Update arsenal.yml

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* EMP descriptions

* Comment cleanup

* Fix Frontier comments, EMP label consistency
* Added Empess cryosleep

Added cryosleep chamber to empress in place of morgue slab

* Update empress.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
Adds fryer to piecrust in addition to a button to feather the thrusters
@Zekins3366 Zekins3366 marked this pull request as ready for review December 8, 2024 13:03
@Zekins3366 Zekins3366 merged commit 28a0c12 into master Dec 8, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.